auto merge of #395 : bkoropoff/cargo/import-shadow, r=alexcrichton
authorbors <bors@rust-lang.org>
Mon, 18 Aug 2014 04:44:14 +0000 (04:44 +0000)
committerbors <bors@rust-lang.org>
Mon, 18 Aug 2014 04:44:14 +0000 (04:44 +0000)
commita30ebb3cfb897440b71d1e9178931c57d19ab242
treed040d76d71e6cea97e0cb8327b56cc3d3661c943
parent4b9ca397781bbdcb822d79bdc6692a7256ee2aca
parentc6f0d283235d984fda385d3a64202233a65fcb7f
auto merge of #395 : bkoropoff/cargo/import-shadow, r=alexcrichton

- Update toml-rs to version without import shadowing errors
- Fix some import shadowing errors in the tests